Autogenerated HTML docs for v1.6.0.4-735-gea4f
diff --git a/config.txt b/config.txt index 32dcd64..d536732 100644 --- a/config.txt +++ b/config.txt
@@ -796,6 +796,14 @@ Specifies how many context lines should be used in calls to diff made by the linkgit:git-gui[1]. The default is "5". +gui.encoding:: + Specifies the default encoding to use for displaying of + file contents in linkgit:git-gui[1] and linkgit:gitk[1]. + It can be overridden by setting the 'encoding' attribute + for relevant files (see linkgit:gitattributes[5]). + If this option is not set, the tools default to the + locale encoding. + gui.matchtrackingbranch:: Determines if new branches created with linkgit:git-gui[1] should default to tracking remote branches with matching names or @@ -818,6 +826,22 @@ the linkgit:git-gui[1]. When set to "none" spell checking is turned off. +gui.fastcopyblame:: + If true, 'git gui blame' uses '-C' instead of '-C -C' for original + location detection. It makes blame significantly faster on huge + repositories at the expense of less thorough copy detection. + +gui.copyblamethreshold:: + Specifies the theshold to use in 'git gui blame' original location + detection, measured in alphanumeric characters. See the + linkgit:git-blame[1] manual for more information on copy detection. + +gui.blamehistoryctx:: + Specifies the radius of history context in days to show in + linkgit:gitk[1] for the selected commit, when the `Show History + Context` menu item is invoked from 'git gui blame'. If this + variable is set to zero, the whole history is shown. + help.browser:: Specify the browser that will be used to display help in the 'web' format. See linkgit:git-help[1].
diff --git a/git-config.html b/git-config.html index 180126a..31f7476 100644 --- a/git-config.html +++ b/git-config.html
@@ -1970,6 +1970,19 @@ </p> </dd> <dt> +gui.encoding +</dt> +<dd> +<p> + Specifies the default encoding to use for displaying of + file contents in <a href="git-gui.html">git-gui(1)</a> and <a href="gitk.html">gitk(1)</a>. + It can be overridden by setting the <em>encoding</em> attribute + for relevant files (see <a href="gitattributes.html">gitattributes(5)</a>). + If this option is not set, the tools default to the + locale encoding. +</p> +</dd> +<dt> gui.matchtrackingbranch </dt> <dd> @@ -2017,6 +2030,37 @@ </p> </dd> <dt> +gui.fastcopyblame +</dt> +<dd> +<p> + If true, <em>git gui blame</em> uses <em>-C</em> instead of <em>-C -C</em> for original + location detection. It makes blame significantly faster on huge + repositories at the expense of less thorough copy detection. +</p> +</dd> +<dt> +gui.copyblamethreshold +</dt> +<dd> +<p> + Specifies the theshold to use in <em>git gui blame</em> original location + detection, measured in alphanumeric characters. See the + <a href="git-blame.html">git-blame(1)</a> manual for more information on copy detection. +</p> +</dd> +<dt> +gui.blamehistoryctx +</dt> +<dd> +<p> + Specifies the radius of history context in days to show in + <a href="gitk.html">gitk(1)</a> for the selected commit, when the <tt>Show History + Context</tt> menu item is invoked from <em>git gui blame</em>. If this + variable is set to zero, the whole history is shown. +</p> +</dd> +<dt> help.browser </dt> <dd> @@ -2859,7 +2903,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-11-14 08:26:08 UTC +Last updated 2008-11-15 08:07:37 UTC </div> </div> </body>
diff --git a/git-gui.html b/git-gui.html index 0242599..59c53f7 100644 --- a/git-gui.html +++ b/git-gui.html
@@ -408,11 +408,42 @@ </p> </dd> <dt> +git gui blame --line=100 Makefile +</dt> +<dd> +<p> + Loads annotations as described above and automatically + scrolls the view to center on line <em>100</em>. +</p> +</dd> +<dt> git gui citool </dt> <dd> <p> Make one commit and return to the shell when it is complete. + This command returns a non-zero exit code if the window was + closed in any way other than by making a commit. +</p> +</dd> +<dt> +git gui citool --amend +</dt> +<dd> +<p> + Automatically enter the <em>Amend Last Commit</em> mode of + the interface. +</p> +</dd> +<dt> +git gui citool --nocommit +</dt> +<dd> +<p> + Behave as normal citool, but instead of making a commit + simply terminate with a zero exit code. It still checks + that the index does not contain any unmerged entries, so + you can use it as a GUI version of <a href="git-mergetool.html">git-mergetool(1)</a> </p> </dd> <dt> @@ -481,7 +512,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-10-31 11:28:35 UTC +Last updated 2008-11-15 08:07:37 UTC </div> </div> </body>
diff --git a/git-gui.txt b/git-gui.txt index 0e650f4..d0bc98b 100644 --- a/git-gui.txt +++ b/git-gui.txt
@@ -65,9 +65,28 @@ example the file is read from the object database and not the working directory. +git gui blame --line=100 Makefile:: + + Loads annotations as described above and automatically + scrolls the view to center on line '100'. + git gui citool:: Make one commit and return to the shell when it is complete. + This command returns a non-zero exit code if the window was + closed in any way other than by making a commit. + +git gui citool --amend:: + + Automatically enter the 'Amend Last Commit' mode of + the interface. + +git gui citool --nocommit:: + + Behave as normal citool, but instead of making a commit + simply terminate with a zero exit code. It still checks + that the index does not contain any unmerged entries, so + you can use it as a GUI version of linkgit:git-mergetool[1] git citool::
diff --git a/git-svn.html b/git-svn.html index eab5ea4..8ec6fe3 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -1178,6 +1178,8 @@ git remote add origin server:/pub/project git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*' git fetch +# Create a local branch from one of the branches just fetched + git checkout -b master FETCH_HEAD # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server) git svn init http://svn.example.com/project # Pull the latest changes from Subversion @@ -1283,7 +1285,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-10-31 11:28:54 UTC +Last updated 2008-11-15 08:07:37 UTC </div> </div> </body>
diff --git a/git-svn.txt b/git-svn.txt index 84c8f3c..ba94cd1 100644 --- a/git-svn.txt +++ b/git-svn.txt
@@ -544,6 +544,8 @@ git remote add origin server:/pub/project git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*' git fetch +# Create a local branch from one of the branches just fetched + git checkout -b master FETCH_HEAD # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server) git svn init http://svn.example.com/project # Pull the latest changes from Subversion
diff --git a/gitattributes.html b/gitattributes.html index b2cb8a5..3cdcdd2 100644 --- a/gitattributes.html +++ b/gitattributes.html
@@ -898,6 +898,16 @@ except that they need to be wrapped like this: <tt>$Format:PLACEHOLDERS$</tt> in the file. E.g. the string <tt>$Format:%H$</tt> will be replaced by the commit hash.</p></div> +<h3 id="_viewing_files_in_gui_tools">Viewing files in GUI tools</h3><div style="clear:left"></div> +<h4 id="_tt_encoding_tt"><tt>encoding</tt></h4> +<div class="para"><p>The value of this attribute specifies the character encoding that should +be used by GUI tools (e.g. <a href="gitk.html">gitk(1)</a> and <a href="git-gui.html">git-gui(1)</a>) to +display the contents of the relevant file. Note that due to performance +considerations <a href="gitk.html">gitk(1)</a> does not use this attribute unless you +manually enable per-file encodings in its options.</p></div> +<div class="para"><p>If this attribute is not set or has an invalid value, the value of the +<tt>gui.encoding</tt> configuration variable is used instead +(See <a href="git-config.html">git-config(1)</a>).</p></div> </div> <h2 id="_using_attribute_macros">USING ATTRIBUTE MACROS</h2> <div class="sectionbody"> @@ -990,7 +1000,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-11-14 08:26:11 UTC +Last updated 2008-11-15 08:07:38 UTC </div> </div> </body>
diff --git a/gitattributes.txt b/gitattributes.txt index a172baf..8af22ec 100644 --- a/gitattributes.txt +++ b/gitattributes.txt
@@ -535,6 +535,23 @@ commit hash. +Viewing files in GUI tools +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +`encoding` +^^^^^^^^^^ + +The value of this attribute specifies the character encoding that should +be used by GUI tools (e.g. linkgit:gitk[1] and linkgit:git-gui[1]) to +display the contents of the relevant file. Note that due to performance +considerations linkgit:gitk[1] does not use this attribute unless you +manually enable per-file encodings in its options. + +If this attribute is not set or has an invalid value, the value of the +`gui.encoding` configuration variable is used instead +(See linkgit:git-config[1]). + + USING ATTRIBUTE MACROS ----------------------
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 3704a1e..88f8acd 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html
@@ -2028,8 +2028,10 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>, -<a href="everyday.html">everyday(7)</a>, <a href="gitcvs-migration.html">gitcvs-migration(7)</a>, +<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, +<a href="gittutorial-2.html">gittutorial-2(7)</a>, +<a href="gitcvs-migration.html">gitcvs-migration(7)</a>, +<a href="everyday.html">Everyday git</a>, <a href="user-manual.html">The Git User's Manual</a></p></div> </div> <h2 id="_git">GIT</h2> @@ -2038,7 +2040,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-10-31 11:29:03 UTC +Last updated 2008-11-15 08:07:38 UTC </div> </div> </body>
diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt index a417e59..61fc5d7 100644 --- a/gitcore-tutorial.txt +++ b/gitcore-tutorial.txt
@@ -1690,8 +1690,10 @@ SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gittutorial-2[7], -linkgit:everyday[7], linkgit:gitcvs-migration[7], +linkgit:gittutorial[7], +linkgit:gittutorial-2[7], +linkgit:gitcvs-migration[7], +link:everyday.html[Everyday git], link:user-manual.html[The Git User's Manual] GIT
diff --git a/gitglossary.html b/gitglossary.html index 1608f86..5f47008 100644 --- a/gitglossary.html +++ b/gitglossary.html
@@ -1142,8 +1142,10 @@ </div> <h2 id="_see_also">SEE ALSO</h2> <div class="sectionbody"> -<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, <a href="gittutorial-2.html">gittutorial-2(7)</a>, -<a href="everyday.html">everyday(7)</a>, <a href="gitcvs-migration.html">gitcvs-migration(7)</a>, +<div class="para"><p><a href="gittutorial.html">gittutorial(7)</a>, +<a href="gittutorial-2.html">gittutorial-2(7)</a>, +<a href="gitcvs-migration.html">gitcvs-migration(7)</a>, +<a href="everyday.html">Everyday git</a>, <a href="user-manual.html">The Git User's Manual</a></p></div> </div> <h2 id="_git">GIT</h2> @@ -1152,7 +1154,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-10-31 11:29:03 UTC +Last updated 2008-11-15 08:07:39 UTC </div> </div> </body>
diff --git a/gitglossary.txt b/gitglossary.txt index 565719e..d77a45a 100644 --- a/gitglossary.txt +++ b/gitglossary.txt
@@ -16,8 +16,10 @@ SEE ALSO -------- -linkgit:gittutorial[7], linkgit:gittutorial-2[7], -linkgit:everyday[7], linkgit:gitcvs-migration[7], +linkgit:gittutorial[7], +linkgit:gittutorial-2[7], +linkgit:gitcvs-migration[7], +link:everyday.html[Everyday git], link:user-manual.html[The Git User's Manual] GIT
diff --git a/gitk.html b/gitk.html index 3efe1ff..3ff3d86 100644 --- a/gitk.html +++ b/gitk.html
@@ -396,6 +396,15 @@ </p> </dd> <dt> +--select-commit=<ref> +</dt> +<dd> +<p> + Automatically select the specified commit after loading the graph. + Default behavior is equivalent to specifying <em>--select-commit=HEAD</em>. +</p> +</dd> +<dt> <revs> </dt> <dd> @@ -504,7 +513,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-10-31 11:28:58 UTC +Last updated 2008-11-15 08:07:38 UTC </div> </div> </body>
diff --git a/gitk.txt b/gitk.txt index ae29a00..317f631 100644 --- a/gitk.txt +++ b/gitk.txt
@@ -56,6 +56,11 @@ Use this instead of explicitly specifying <revs> if the set of commits to show may vary between refreshes. +--select-commit=<ref>:: + + Automatically select the specified commit after loading the graph. + Default behavior is equivalent to specifying '--select-commit=HEAD'. + <revs>:: Limit the revisions to show. This can be either a single revision
